configure: properly require libx264 if enabled
authorMarvin Scholz <epirat07@gmail.com>
Sun, 24 Jul 2022 10:11:49 +0000 (12:11 +0200)
committerSebastian Ramacher <sramacher@debian.org>
Wed, 24 Aug 2022 21:33:44 +0000 (22:33 +0100)
When libx264 can not be found even though it is enabled, it should error
out properly instead of silently disabling it.

(cherry picked from commit 564d7946de56155d1c42165a8b561fcf5028cbbc)

Gbp-Pq: Name 0002-configure-properly-require-libx264-if-enabled.patch

configure

index 9d6457d81b759f53e9346f487a07bc93359ed582..6e012e44bca1fb5f8961bc197b0024e145633c4e 100755 (executable)
--- a/configure
+++ b/configure
@@ -6666,7 +6666,7 @@ enabled libvpx            && {
 enabled libwebp           && {
     enabled libwebp_encoder      && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
     enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
-enabled libx264           && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
+enabled libx264           && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
                              require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && {
                              [ "$toolchain" != "msvc" ] ||
                              require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&